Merge from origin/emacs-27

cf0ee6f49b ; spelling fixes
16f4f26632 Fix startup working dir bug on NeXTSTEP

diff --cc lisp/desktop.el
Simple merge

diff --cc lisp/emacs-lisp/rx.el
Simple merge

diff --cc lisp/progmodes/cc-engine.el
Simple merge

diff --cc lisp/simple.el
Simple merge

diff --cc src/composite.c
Simple merge

diff --cc src/emacs.c
Simple merge

diff --cc src/xdisp.c
Simple merge

diff --cc src/xfns.c
Simple merge